security(scrypt): Force Scrypt parameters to have all n, p, r values#4680
Merged
sergei-boiko-trustwallet merged 9 commits intomasterfrom Mar 6, 2026
Merged
security(scrypt): Force Scrypt parameters to have all n, p, r values#4680sergei-boiko-trustwallet merged 9 commits intomasterfrom
sergei-boiko-trustwallet merged 9 commits intomasterfrom
Conversation
Copilot started reviewing on behalf of
sergei-boiko-trustwallet
February 25, 2026 09:42
View session
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aims to harden keystore scrypt parameter parsing by requiring n, p, and r to be present in JSON input and validating the parameters early to fail fast on malformed keystore files.
Changes:
- Added a presence check for required scrypt parameters (
n,p,r) when constructingScryptParametersfrom JSON. - Added a validation step intended to throw
std::invalid_argumentwhen scrypt parameters are invalid.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Binary size comparison➡️ aarch64-apple-ios: 14.34 MB ➡️ aarch64-apple-ios-sim: 14.34 MB ➡️ aarch64-linux-android: 18.77 MB ➡️ armv7-linux-androideabi: 16.20 MB ➡️ wasm32-unknown-emscripten: 13.68 MB |
erdemaslan-tw
previously approved these changes
Feb 27, 2026
nikhil-gupta-tw
previously approved these changes
Feb 27, 2026
sergei-boiko-trustwallet
dismissed stale reviews from nikhil-gupta-tw and erdemaslan-tw
via
51b3cf6
nikhil-gupta-tw
approved these changes
Mar 6, 2026
davidkulman-tw
approved these changes
Mar 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request updates the construction logic for
ScryptParametersto improve validation and error handling when parsing JSON input. Now, the constructor checks for the presence of all required scrypt parameters and validates them, throwing clear exceptions if any are missing or invalid.Improvements to input validation and error handling:
ScryptParametersconstructor insrc/Keystore/ScryptParameters.cppto:n,p, andr) in the input JSON, throwing an exception if any are missing.